Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

session: fix tidb_enable_gc_aware_memory_track after upgrade (#40173) #40179

Merged
merged 7 commits into from
Dec 27, 2022
Merged

session: fix tidb_enable_gc_aware_memory_track after upgrade (#40173) #40179

merged 7 commits into from
Dec 27, 2022

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #40173

What problem does this PR solve?

Issue Number: close #40174 ref #39971

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@chrysan @ti-chi-bot
This is an automated cherry-pick of pingcap#40173
5de3ddf 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot requested a review from a team as a code owner December 26, 2022 13:06
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Dec 26, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • time-and-fate

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Dec 26, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 26, 2022
Merged
12 tasks
@jebter
Copy link

jebter commented Dec 26, 2022 •
edited
Loading

/run-all-tests

1 similar comment
@jebter
Copy link

jebter commented Dec 26, 2022

/run-all-tests

@sre-bot sre-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 26, 2022
BornChanger
BornChanger reviewed Dec 26, 2022
View reviewed changes
session/bootstrap.go Outdated
@@ -732,6 +732,13 @@ const (
version107 = 107
// version108 adds the table tidb_ttl_table_status
version108 = 108
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rebase ?

BornChanger
BornChanger reviewed Dec 26, 2022
View reviewed changes
session/bootstrap.go Outdated
@@ -849,6 +856,11 @@ var (
upgradeToVer106,
upgradeToVer107,
upgradeToVer108,
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 26, 2022
@chrysan
Copy link
Contributor

chrysan commented Dec 27, 2022

/run-build

1 similar comment
@chrysan
Copy link
Contributor

chrysan commented Dec 27, 2022

/run-build

@chrysan
Copy link
Contributor

chrysan commented Dec 27, 2022

/run-unit-test

@chrysan chrysan requested a review from bb7133 December 27, 2022 02:10
bb7133
bb7133 approved these changes Dec 27, 2022
View reviewed changes
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Dec 27, 2022
@bb7133
Copy link
Member

bb7133 commented Dec 27, 2022

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: 0cbdfbb

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 27, 2022
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Dec 27, 2022
@chrysan
Copy link
Contributor

chrysan commented Dec 27, 2022

/run-unit-test

@chrysan
Copy link
Contributor

chrysan commented Dec 27, 2022

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: dce0e38

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 27, 2022
@ti-chi-bot ti-chi-bot merged commit 706c3fa into pingcap:release-6.5 Dec 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BornChanger BornChanger BornChanger left review comments

@time-and-fate time-and-fate time-and-fate approved these changes

@bb7133 bb7133 bb7133 approved these changes

Assignees

@chrysan chrysan

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-chi-bot @jebter @chrysan @bb7133 @time-and-fate @BornChanger @sre-bot